Issue 4097: Code structure fixed