fix from new base
some stupid mistakes...