Second pass at #450