fixxed critical bug