Fixed minor bug with value provider