Fixed an issue with the new intent structure