Fix #437
Fix #455