I see 2 extra spaces here.

Otherwise, this is a great modification IMHO!