Fix for defense - you need this commit. merge it!