Cleaner fix for issue #5.