Fixes dumb logic.

This should be ready to pull.

May revisit later.