Mistakes fixing