fixing jump to issue