#FEC-2103 #comment use redirect workaround only when its needed