Imported a bug fix