Change like @dpaleino suggested on #616