Fix computation order
Fix conflict