added bugfixing into horizon