Fixex #399