Fixed some bug

Request is needed