I am not having the issue (yet?), but I do like your approach