move things around, make it 1.2.18 compatible, fixes #3