Fixing mock member termination logic