Fixed bug grade A