Bug #10 fix