Workaround for issue #18