fixing some edge cases