Better hackfix for Master's Call