Fix for the experimental feature