Test and bug fix with PR #387