fix for 113
fix for 110
fix for 96