Change for #578