Fix #589