eliminated memory leak due to objectMap