Fixing(?) #305:  The adventure continues!