Fix missing From clause in share marshalling