fix of #242
fix of #243
fixes