Fixed after merge in engine