Removing the jump and stop bug