fixed disabled and empty cells