Fixing issue with master