Workaround for iussue #38