Workaround for issue #1