working on Bug #15