bug fix. last clean version.