Fixed after merge