Fixing Bug #81