Merge fix

Not 100% sure how this slipped though.