Sticky bug fix attempt