Fix #455
Fix #452