Another attempt to fix the bug