fix error + consistancy