Fix #384
Fix #450