Brian's fix