* Fixed this for some edge cases