Fix fabric-rest feature