added terminate protection?