changed to work also with old MC