cleaner fix for issue #1338