OPAL-1769: Trying a different approach for stopping...