Fixed brokenness regarding parameter passing