Fixed NEXIOS-538