fixed Order of Operations issue