bug 307 fixed