improved edge case behavior
0.2.7