Attempt to fix Master's Call