Fix assignment bugs 1

@peter-budo