finally fixed "update on _id not allowed" error!
(cherry picked from commit 68ed396)