Fixed error after merge