Fixing Stephen's bug.