Adapted changes from PythonClasses4Mad commit