Restored compatibility with 2.11