Fix #399