finally fixed that bug