Checking in Issue #64 migitation code. Still no idea what causes that.