Fix Bug #9 Bug #16