Fix based on feedback for @leftclickben