#ngp-20 Fixed