Additional code on #6

Bug #6 still open