Fix to maker logic of mappable objects