FIXED: Don't run into loop of last commit. #32