Fixing Bug #69