Fix for some Android devices
Code is cleaner
v0.1.13