Correction of stupid mistakes for previous commit