Fix actor & feature