I haven't tried creating a custom tool, I suppose that would help. Tried prompting a lot to fix it but as you told I guess it's an issue with the tool