Fixing history redirect issue ( I hope :-) )