fixing raw types