Implement jump back related to issue #267 feature request