Fixing Bug #66