CFY-1316 better implementation