fixes KON-6

review implementation of TODO action