I think I fixed bug #0 ..finally