Change for #220

Done