Fixed 10.3 to work with edge cases