Fixing redundant function wrapping.