Fix bug with not stopping at piece end
Merge