Fixed NEXIOS-532 and NEXIOS-481