Fixing Bug #17