fix troubles