fixed errors for our specific case