Fixed errros