Fix for an issue