Issue #206 final point mixed with statistics of Mahdi