Function fix for review