Fixed incorrect assignments