Updated to fit commit 25c62f04e3