Fix #440