Bug #11 fixed