corrected one liner issues