History now works properly