Fix #421 and Fix #419