Actually fix #17 (evil of copy&paste code)