watching for some edge cases