Fix #16, and now things actually make sense!