No, workaround still needed