Fix incorrect logic and typos in previous commit
1bfd07bd.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>