Fixing sticky bugs