Attempt at #1956 DO NOT MERGE

My attempt at fixing this issue, not sure its great