Support for more edge cases