Fix order of function pointers

Change-Id: Ic1bae7fcebfaf35b62aecd86ed8b3a70fae3e4d3