Fixed master crash (hopefully)