fix the sticky bugs