First pass at #238