Fixed bad assignment