Thanks. I could commit this changes as a separate request if this one isn't merged.