Trying bugfix to reduce 3 clicks to 2