try to make it kazan compliant