fix #595 and fix #550

Yep, that's fine!