making system2 more robust