TryFix for #38