fixing broken clicks, fixes DEVELOPER-393