Fix original behavior and add two examples.