issue #1 workaround