fixed issue #9 tracked from the Android github project