Fix #444