Fix #587