Sush | #2105 | handling some edge cases.