Small changes trying to find the bug