Fixing Bug #11