main 97d+15 fix