Take care of odd edge cases