Remove ugly assert