Bugfix and level generalization