Fix REST serve mechanism