Function expansion fix