0.11b -> small critical bug fixe