TEMP fix for issue 94

TEMP fix for issue #94