applied patch 0a1cb79ef2034b82d4b5987ed3580388139f3ba8