try to resolve bugs