fixed mistakes from earlier commit