Early exit
Fixed bug