ENH: repared the last mistakes