fix #7 universal support