Fixes inner assignment issues