Fixing Nick's bug.