fix 41 fix #41