accept some changes from original NME repository ...