reverting back fix for issue #77