#2 #12 #13 fix