Bugfix to on_rightclick