Fix fixing api inconsistency