Fixing broken things in eye-opening one-hander