Change to logic of History service which fixes #17