Bugfix for where usage of an API > 16 method was introduced into the code with no checks.