fixed complalation issues when used with z1-feshie