Another try to fix the bug