Applying fix to master Mela_Class