Workaround for issue #1474