Bug fix: #377359
- using a more appropriate method and by this resolving this strange bug