Prevent another potential problem...