fixed with last commits