Added fallback for current nav pos