Temporary workaround for issue #1