Ispravka buga, issue id 30