Improve wrong parameter issues