Workaround for issue #5