fix 249, 252