Undefined check, please pull to master @jkcclemens