Bug with map objects management