Fixes #27

The solution is suggested here : <https://code.google.com/p/android/issues/detail?id=63673>