fixed 2 #124