fix issue #2 with workaround