typo (fixes #2)
silly merge thingy