Fixed stripping of $id from original