Fix: force finish call