Accomodate the changes in Jamoma/JamomaCore@89be7c9