Fixed 'Inner Assignment' issues