Made the back-functionality work properly again.