Fixed #1046. Substring is now mentioned correctly