Feature #74 - click fix