Fix running on old apis