Fixing Bug #2