same bug you found in your branch #23