Corrected behaviour after fixing CON-879