Now works pre 1.5 & version bump