New -- should be part of the test suite but this is better than nothing.