Potential Fix for #194

Reverted a code change