fix #26 (not tested)