fix "current bugs"