Fixing Lyntor's bug.