fixed bugs on tip