Fix my previous patch about type parsing