This might fix some exploits with the undertaker