Fix for potential weirdness on 2nd outputs in some cases