Fixed non-comp code