Fix #918