Update to 1.7

Changed OnClick fix so the default behavior is still available.