Added check to prevent move override