Fix level handling