DataDir provider fix