Fixed failed cases