D'oh! Looks like there's still room for improvement :-/