1-fix-assignment-errors

fix for the issues in the original code