Temp fix for issue #295