Fix #407
Fix #408