Changing the logic for assesment to fix the bug