Huh... a lot of minibugs here. Time for 2.0.1 ?