Fix matching bug due to piece positions
Commiting merge and deleting source map