Fix goto routine
Fix for dropbox