Reverted to told method due to fix in API