fixed for android
logic update