Fixed for user APIs