Support base < 4.6 too (#33)