Fixed for null values in orientation data