Potential fix for the bug