Improved stability issues caused by asserts