Fix event rect for edge case - #592