fixed the lollipop bug