work to fix #29