Fixed NEXIOS-524