fix for issue #206; not perfect, but much better now (for me)