partial fix of #122