Temp fix for issue #1120