Fix #579
Fix #579
Fix #578