Potential crash fix & minor signature change