Found new edge case and added a test and fix.