Temporary workaround for issue #1

Temporary workaround for issue #1