utils: fixed #93, #94