Dumb copy-pasting is evil! Fix #18