Fix #925