fixed issues with edit from last commit