Fix #577