Adjusting commit 352efb5a3d436962211807d5b2644f23a65541fe