Fixed start finish bug