fixes on v1.1