Fixed the bug with history navigation
Changes made by Marieta Georgieva (marietambvg@gmail.com).