finally fixed problems