click support fixes #3