Fixed the conditionals.

I guess I was too hasty with the ifs.