Still assertion failure
I cannot find any explanation to the assert bug
Some cleaning