Bugs

Branch is checkout from `refactor` so it contains commit from it