#204 with fix for REST breakage