Proper fix to If, hopefully.