Use the correct constants
Implement API <16