make it work with 5.7