Fix #829, Check-in WIP