Attempt at #1956

I think this fixes the issue, i might be very wrong though