An opportunity to fix #38