Fix inout support, preliminary