Feature/bug fix