added fix for yappem environment