Fixing Rupert's bug.