Another attempt at fixing problems with angular