Updated resolution by eNAP on 06-12-2017