#6: fixed errors