Bug #29: Fixed