Tidied up degenerate case