Now works pre-4.1!