Master fix

Could you please take a look at my fix?