Fix #534
Fix #508