fixed mastro number detection