Fixed wrong function calls