fixed sonjas bug