Cleaner fix for #93