Another attempt at fixing this