seems to solve bug #1 but check needed before closing issue