Implemented #39 for remote usage