bugfix assign to map