fix #117; for good