hopefully fix #236