Fix functionality issue auto-calling functions