ISSUE#86

Revert back to previous version.