Feature #74 - click fix 2