Fixing who one bug