fix #63 (untested)