Fixes order assigning