CHANGE: Improvement to efficiency of level crossing fix