Fix #439