Fixing a 1-off bug