Fix for ALV-327