Updated to work with r20444