Fix bug with instance arguments introduced a few days ago