[#1369] wip fixing request