Fix for assignment of values