#114 more fix