Merge "Remove wrong class cast"