possible workaround for issue #9 of original repo