Final fix for ALV-278
Fix for ALV-324