Reintroduce click handler from v0.0.1