correction + correct bug