Fixing issue directly on master