Fix #464
Fix #466