Apply N3X15's fix