Fixed statement gotos to not be called