Errors caused by previous commit corrected7