Fixing issue with _