Fixed NEXIOS-525