Attempt at #1956

My attempt at fixing this issue, not sure its great