Add <nowait> for mappings