#141 partial fix. the problem should be solved in principle