Another fix to prevent unnessary loading