Fix for the bug