VID-1426 Use self when accessing static methods in same class