Fix incorrect logic and typos in previous commit
1bfd07bd.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>