Added @otnateos patch.