Merge "Fix for elif."