fixed issue #8 with workaround