Fix assignments