Fixed nasty caller bug