update with fixed version upstrem, expand and make clearer
include fix from upstream