Fix #573