Workaround for issue #11