Fixing Bug #187