Fix #390
Merge branch 'issue390a'