Fix for the issue