Addresses SCF-2622 please review.