Small framework change