bugs resolution :)