Fix troubles