Final fix for 0 of 0 issue