correctly handle callsites