Issue #162 - Fixing Bugs