added tests to reproduce angie's issue
angie's issue fix