More efficient general fix black hole bug