Context aware not working correctly.  See #143