Temporary 2.3 onClick fix