fixed for fastapps04