fixxed bugs with last commit