Fixing no-caller bug