Temp fix for issue #193