Fixed NEXIOS-550