values now correctly set