Fix for the other completion handler that Josh implemented, since he had not seen the changes I made to it yet.