CON-2040 | Fix by remove