Master fix 1
Master fix 2