Bug Fix #229 for Android