Added workaround for missing method