fixes problems in assignment flow