fix for new functions