FIXED: Assignment bug