Fixing assignment validity (MID-1819)