Fix for android v2