Workaround for issue #61