fixed to use master on core and raspi