Fix ALV-661