Feature/bug2