Fixing to the correct endpoint