Calculation condition not working properly (2 issues)