Fixed NEXIOS-139