Np 2650 fix

CLOSE THIS PR . CREATED BY MISTAKE