bug removed -- not so much better now :/