Image click fix #12