Fix #419. Fix #400