Nowait fixed