fixup by lollipop