Workaround for issue #539