Hopefully fix a dirty edge case that's been happening lately.