Squashed 2 bug regarding compatibility with older API versions