Fixed api inconsistency