Issue #68: Critical bug fix
Merge pull request #69 from labboy0276/3.x

Issue #68: Critical bug fix