Fix for androin 4.0.4 - #8542