Resolving bug #69