cleaner fix for #19