hack for issue #1