PVP issues as described in ticket 491 should be fixed.