Map prints logs again and crash bug fixed