Second pass at #238