Fix computation order