Fix #441