change: fixed some errors due to last change