Fixed problem of losing selected cell class