fix implementation to suport version 1.1.