Another attempt at fixing this issue