moc location fix
merge