History issue fixed