Fixes Order of Operations