works on neo 2.3.1 !

Change-Id: I652ed8a67539b88c92dd5403862f5a2d7350d54f