Reproduce #58 again, yeyy