Slightly neater fix