Merge ash/13w44 fixes : fixed Issue