Fixing for an issue