#23 reproduced in test
#23 fixed