fixing of bugs