marina: add some additional control over the proper stopper counter