Question internal function fix