fix edge cases for previous commit