Fix the Mystery NaN Problem

As described in issue #261, I've solved the problem, but there is no
problem-specific test yet.
Fixed a Line That's Too Long

Ermahgerd......................................................................................