Fix operator x=() to return reference