Update for commit edfb3d6