Fix #517