Corrected bugs due to missing line in last update.