Double checking fix