Tried (again) to fix screwdriver crash.