Arguably a cleaner fix for issue #2124