before fix