fix of #113 and more