The fix by Nick Spencer