Develop

Fix for Twoway jump bug.