fixing for new logic