This will probably break when we'll hit-detect features drawn with the immediate API. Just a comment. Nothing to change in your code at this point.