Bugfix: Make sure we are dealing with a parameter, no matter what