Fix #292 and Fix #323