ALV-338 fix