FIX bug in code order