Fix #442