Finally ... fixed the bug