the demo broke on android stock, maybe needs weak map?