Fix for Jumps on null