It fixes #1 I can go for another & better if there's any on your mind, but this is something I could think of in the first place.
mjackson
