I believe this fixes our bug, however I am not 100% sure, can't get it to replicate.