fix mistakes related to previous changes