big bug fix :)