fixing of da bugs