Added workaround for current sdk