Corrected issues