Prepared for release 1.16, try #2