Additional fix for NEXIOS-522