Bugfix - Substring removed