Workaround for ALV-444