Fixing an issue