Fix #824