Fixed this bugs