Fixed wrong calls to isSystem() in master-slave after API changes