resolves rb#14 fix rb#13 closed rb#202520249