Jumptables corrected