updated to fix changed property issue on Android