fix for modern stuffs