Possible fix #38