I think a quick redesign of the bottle shape could help prevent this (or, you can just take the cap off and pour ... for last ...