Issue #163 - Fixing a bug in the last commit