Fixes CNG overflows from the previous commit