removed shortcut on finished flag