Fix #802
Fix #910, 914