Reverted to v.1.5.2 with fixed click method rebinding