fix further bug