Fix #411