- changed maestro detection logic