fixed defects in working