Another fix
Finish task now works properly
Now synching with upstream before starting to work on an issue