corrected function call
Merge branch 'cleanup'