The fix by Nick Spencer | tbr*a