Workaround for issue #97