Resolves none/nan problem

This commit should resolve the test failures.