Vectorise case of unit correctly