Cleaner fix for dead bug