Fix Nick's problem