ticket:1 fixing problems