fix for android support