Bug #7 Fix