squashed some edge cases