Fix arguments not being parsed correctly