Fix assertion problem