Workaround for issue #66