Bugfix for Q's screwdriver bugfix