Sligh adjustement to the master to get rid of null pointer