Fix issue with backward and forward being wrong