Reproduces both issues in #227