Fixed NEXIOS-434