Fixed only one of bugs